Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

20241213-fips-check-refactor-assoc-arrays #8291

Merged

Conversation

douzzer
Copy link
Contributor

@douzzer douzzer commented Dec 13, 2024

fips-check.sh fixes + enhancements:

  • change default WOLFSSL_REPO to the canonical upstream.
  • refactor tag calculation without bash associative arrays, for backward compat.
  • add support for fetching FIPS tags/branches into a persistent fips repo if one is found at ../fips.
  • use --shared in git clones where applicable.
  • always check out the master FIPS branch, for its tooling, and always make sure it's up to date with $FIPS_REPO.
  • after each fetch for a previously unknown tag, explicitly associate the tag with the FETCH_HEAD.

tested with wolfssl-multi-test.sh ... check-source-text check-shell-scripts, and with /home/douzzer/src/bash-3.2.57/bash ./fips-check.sh fips-ready and /home/douzzer/src/bash-3.2.57/bash ./fips-check.sh linuxv5

* change default WOLFSSL_REPO to the canonical upstream.
* refactor tag calculation without bash associative arrays, for backward compat.
* add support for fetching FIPS tags/branches into a persistent fips repo if one is found at ../fips.
* use --shared in git clones where applicable.
* always check out the master FIPS branch, for its tooling, and always make sure it's up to date with $FIPS_REPO.
* after each fetch for a previously unknown tag, explicitly associate the tag with the FETCH_HEAD.
@douzzer douzzer force-pushed the 20241213-fips-check-refactor-assoc-arrays branch from 901785a to 7c5451c Compare December 14, 2024 03:36
@douzzer douzzer assigned wolfSSL-Bot and unassigned douzzer Dec 14, 2024
Copy link
Contributor

@kaleb-himes kaleb-himes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure what is causing this but on an aarch64 M1 macOS using this new checkout script results in the build believing I am on an intel mac system, something is affecting auto-tools ability to detect the correct environment:

 245 --- new-XXX-fips-test/Makefile→→2024-12-17 07:35:46                      
 246 +++ old-XXX-fips-test/Makefile→→→2024-12-17 07:44:54                      
 247 @@ -633,9 +633,9 @@                                                              
 248  NORMAL_UNINSTALL = :                                                            
 249  PRE_UNINSTALL = :                                                               
 250  POST_UNINSTALL = :                                                              
 251 -build_triplet = x86_64-apple-darwin23.4.0 <-------- New solution thinks it should be an intel mac???
 252 -host_triplet = x86_64-apple-darwin23.4.0                                        
 253 -target_triplet = x86_64-apple-darwin23.4.0                                      
 254 +build_triplet = aarch64-apple-darwin23.4.0 <------- Old solution gets it right
 255 +host_triplet = aarch64-apple-darwin23.4.0                                       
 256 +target_triplet = aarch64-apple-darwin23.4.0  

@kaleb-himes kaleb-himes self-requested a review December 17, 2024 16:41
Copy link
Contributor

@kaleb-himes kaleb-himes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NVM good to go after a clean out and fresh clone. I think it was due to stale master.

@kaleb-himes kaleb-himes merged commit fcbea85 into wolfSSL:master Dec 17, 2024
145 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants